Add comment and make minor code clean-up to improve clarity.