code cleanup, fix error displaying types, change Callable