Use an application factory in prep for unit testing
Made model comments more useful