Removing unnecessary templates
Added comments, removed unused methods
Simplified templates
Removed temp file