Cleaned command parsing.