Commenting, indentation fixes