cleanup & optimize lookup dao following up discussion with Frank