clesanup
Templates
Minor commenting