minor cleanup, removed logging and whitespace