Spaces
beautification
Refactor