Better cleanup handling
Uppercase the entire command if not already