A few little cleanups for the view