[ordering] comments, rename of subroutine