cleaned it up a bit #forMatt