Small refactoring.
Remove settings config
Update settings
Skip empty command
Fix CS