Random cleanups

Just a few random cleanups