Minor style changes.
Starting to clean up code.