Jon lock refactor