Cleaned up a ton of code

Email Template Finished!