Wiser function names
Refactor