major styling overhall and refactoring