Replace all occurrences of typedef with appropriate using declarations. Unify spacing. Delete redundant typenames.
typedef
using
typename