fixed some whitespaces and casing
camelcased all member variables