massive styling refactor