code cleanups - using using instead of typedefs