Fixed lock message in pickupbot
Some refactoring