refactoring: remove spaces' etc