small costmetic cleanups