Fixing whitespacing
Resolves #40 #4 #31