Hope final refactoring
Spaces...