type tweaks

clean up code only