Misc cleanups

@fosdev Please review and merge!
I add this because of this: resource_descriptor.links['self'].href 
Initially, if self is not present that would throw an error.