Pythonic!

Make some function calls more 'pythonic', need to rewrite more logic for
new columns in database, boo.