Added comments of refactor plan