Clean up

This feels a bit easier to read.