more whitespace and fixed imports