Cleaning up the code a little more