Cleanup
Remove separate spaces