preparing for templates
minor cosmetic changes