put types closer to their defns