whitespace immprovements