Cleaning up

Merge me please