Move comments into if scope