Simplify type signatures