cleaning up to follow best practices#8

euforic wants to merge 2 commits intomaineuforic/templit:mainfrom

euforic/cleanupeuforic/templit:euforic/cleanupCopy head branch name to clipboard