Cleanup after last commit
Improve function pointer