Made slim template cleaner and more efficient
Merge pull request #2732 from L8D/patch-1

Made slim template cleaner and more efficient