-Cleanup: minor code style and whitespace changes