function signature cleanup