#93 refactoring Types: some