code cleaning, move hql queries to dao