A lot of refactoring
a bit refactoring
deleting lots of stuff