Some cleanup and stuff