Post Code Analysis. Tons of changes to make checkstyle happy.