Aaaaaaaand some Cleanups from me