styles and refactoring
simplify
bunch of stuff