Simplification

You're totally right. I didn't tidy it up properly :)