Just cleaned up some stuff, still passing all tests as of the date this was commited