Automated code clean-up.

Code run through a series of clean-up filters in eclipse as an initial
step before refactoring.