Issue #504 fixing spacing