Not entirely necessary (one suddenly finds out), but db code should be a tad cleaner