Refactor commands
Clean up settings