Controller edits, cleaning up