Refactored crowbar service for better readability