Another pass cleaning up types and var. names