Checking if comments enabled and indentation fixes