Simplify callback function names
Simplify constructor