simplified things a little