second refactored commit
second commit with refactoring