Code cleanup: use public static, not static public