cleaned up content and organized templates