Cleanup using 'function' at front of definitions