Large refactor, fix styling