Much better style and command parsing.