Feature/misc refactoring #102

Closed apollocoder closed 7 years ago