simplifying a few things