removing whitespaces
more whitespace cleanups