Small formatting and comment changes
Add inline class and pass through to bucket handler
Converted tabs to 2 spaces.  Cleaned up indention.  This is all whitespace changes.