Mild code clean up and stuff...