Removed repeating code; Fixed command translation issue