General controller and view cleanup