Cleaning up code a little bit.