Dao/service method added and code cleanup