hlim10 lchen59 : Small Refactoring