Added delete-whitespace-and-indent and fixed whitespace