typedef -> using + other style improvements