Cleared up lock/unlock logic