Added Utils.java and cleaned up some things