changing case on variables to abide to follow naming conventions, hopefully...
also trying to use final where it makes sense, for variables at least