Moved some msgs and command to consts. The previous version works correctly
removed some todos