a little bit of refactoring

no more camel case