Clean up code a little bit