Refactor user specs
Rename legacy stuff
Indentation