Cleaned up Templates