Hopefully cleaned up some things