Cleaned up templates, refactored http executors