Cleaned up command parsing.