Cleaning up Images.java