Combine comment+uncomment into one method