CamelCase Vars... and remove unnecessary commented code.