Refactored makemessages command