cosmetic cleanups (using versus typedef)