*sigh* This should finally fix the checkstyle problems