Cleaned up the templates a bit more. Tried to remove some redundancy.