REFACTOR: More cleanup