Clean up some code a bit