Clean up code. Move types of command to common.Settings