Cleaned up
Cleaned up
Updated templates