refactor: Cleaning up code for various files #58

Closed spjy closed 5 years ago