Updated comments and minimal cleanup
Remove chainable code indentation