Code style fixes and comments