Overall refactor