- Making a clearer distinction between database IDs and dataview IDs
- Some PEP-8 fixes.