Finishing revision 1 of clean template