Ugly if else fix

Cleaned up the TODO about fixing the ugly if-else in rdb.py