cleaned up more with typedefs