style fix
refactoring of all this shit haha. it's awesome haha