Cleaned up comment, naming, formatting, imports and documentation.
Merge remote-tracking branch 'origin/master'