Cleaning up the code a bit more