fixing style - indentation
fixing style - function naming
further function style changes