hlim10 kchen26 : Refactoring