Fixed nits addressed in PR 4 by pzhang

- coding style nits
- place logging message in loggable checking block