Cleaned up WaterParser.java