#461 Fix Extra spaces