improve nuts/lock-nuts implementation