Cleanup and work toward Template Toolkit