Method signature cleanup