Made some things easier to read