Improving the code of function declarations