Some basic cleanup
Merge