clean up, matching code to text