Some cleanup to resolve warnings and formatting in NetBeans.