Cleaner if statements
Reset Java 6 incompatable change