Refactored for clarity, optimized hard drops