style/cleanups