Just cleaning up some stuff I had forgoetten in the previous commit