refactorings, cleaned up added spaces