Use space space
Refactor code and progress