cleaning up the code a bit