A little bit of cleanup on db helper