Cleaning up code for relational functions.