Extracted a function of removing spaces.
Removed unnecessary code.
Merge branch 'refactoring'