Stuff!
Some cleanup