Issue #468 Removing extra spaces