Clean up code just a bit