- several whitespace changes for code beautification