SPMetadataStorage: Code Cleanup