refactored rap-worker so variable names make more sense than before