More cleanup. Next up: View controller modification