Minor cleanup for readability
Merge pull request #1531 from ke-yu/code_cleanup

Minor cleanup for readability