refactoring

changed naming

added some styling