Minor clean up and refactor: now ready for putting into tastypie rest/django framework