Complete refactor, big cleanup