Clean up commands and option handling