removed many extra whitespaces; fixed 1 warning