Clean up the database module a bit
Clean up the database module a bit

nh2/shake,ndmitchell/shake,nh2/shake,nh2/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,nh2/shake,ndmitchell/shake,nh2/shake,ndmitchell/shake