just a few cleanups and standardizations