Cleaning DAO and adding logger messages