typedef was removed where it wasn't nedded