Various
Refactoring a lot of stuff
refactoring
fixing space issue