modify Dao (cleanup)
modify dao