Cleanup Const.java