attempt at making the diff more readable