few random cleanups