Spring cleaning, starting to modify template