Cleaning up code a little.