refactor: make messages more prescriptive