clean up thread unsafe setters
whitespace