Tidy up

Was getting confusing.