Some basic clean up