Renamed more variables, removed template notes