Simplify signatures