Consistent camelCase notation

Sorry for the mix, in my code it's: camelCase for methods and lower case
with underscores for vars, so to easily differentiate them.