Refactor lock collecting and method locks