Some variable name change (camel casing still)
Some more refactoring