Clean up and added Utils.java