Trim spaces
Refactor