Cleaned up rowToDict functions