Refactored jrun