Minor code clean up in prep for templates