Minor changes to clean code a little.