Code cleaning on template

cleaned up tabs and line breaks, removed uneccessary commented items