Just merge this part please, fixes comments on statement lines