Patching a few warnings in the Structure class
Whitespace.
Cleaning up more warnings.