Some fixes of the previous commit: indentation and unnecessary comments
removed