minor code clean up, whitespace