Maintenance: Gamera jobs - clean code structure