Minor docstring tweak
Clean up models namespace by removing local variable

This also gets rid of the double-appearence of an item in the API docs
Fix for corner case encountered while debugging