Minor simplifications

Just a round of small stylistic changes. I hope this helps!