refactor for use with tomcat-all recipe, part 2