Split and move comment following code review