Cleaned up syntax for all templates
CODE EVEN SMALLER!