REFACTOR: Cleanup dao code