Fixed #50, improved some whitespace
See previous commit