Improve function names and invoking