code convetion cleanup: fix long lines, whitespace per feedback on WEB-7316