cmd/lara: refactoring