insignificant refactoring
DAO layer was introduced