minor code clean up
Merge branch 'ja-code-clean-1' into develop