fix some indentation and comments