more code cleanups  - using 'usting' to simplify code