Refactoring - Reformatting and optimising imports

As I went through the project to take notes I reformatted and optimised the imports in the code I went through.