Refactored Fire Feature Layer/CT Feature Layer code