Housekeeping / formatting

Mostly correcting comments and line spacing between classes and functions to make it bit more consistent and readable