Refactor - minor update