Small refactoring, added settings