somewhat more readable now?