Some trivial refactoring, replaced type names with more compact equivalents