Some clean-up and a toggle command