And yes I also think templates should be used everywhere (and in your new branch) but I wanted to have some feedback before changing all the code.