Fixed up whitespace tools