Clean up of spacing
Fixes issue #89