W fix indentation and comments