adds some style
changes
refactor, hardcore