Refactor away useless typedef