Fixed?

Not sure if it works yet, but definitely shorter and easier to read.