Cleaning up of code a little.