Java 7 Updates and removing unwarranted optimization
Variable naming consistency