Refactoring - Reformatting and optimising imports - Partially solving #53

As I went through the project to take notes I reformatted and optimised the imports in the code I went through.

This is partially solving issue #53 although maybe we should agree first on what everybody is more or less comfortable with.