cleaning up comments per @kjetilk and indentation per @kasei