Cleanup main method signature