Made some things a little more efficent