Simplifying a few things