Improved Constants.java