First pass at cleaning the code by running the Inspector.