cosmetic code cleanups - using using isntead of typedef