cleanups and standardizations