essentially just random cleanups