Removed trailling whitespaces
  removed trailling whitespaces and corrected some indentations from 4 to 2 spaces