Simplifying things a bit