Cleaning up the thinking