some code style fix-ups