Stuff refactor
More refactor
refactor stuff_spec
...