Small refactoring + added checkbox