CR: move comments above function body