Modernized to work with array-style interfaces
Fix comment style and justification
Version 2.3