Code cleanup and AttributeStatement support

This adds some minimal code clean up and adds a way to access attributes from the saml:AttributeStatement block.