Just some cleanup and stuff...