Comments, indentation fixes