Simplify interfaces and function signatures