Removed TODO from DBHandler

Added some code review stuff as well. may not be needed, but there it
is.