All whitespace corrected