cleanup some of the unnecessary type inference