Clean clean
More line wrapping changes
Whitespace
Declare return types on Public methods, make clear which methods return Unit