Small refactoring to improve some function names.
Code that answer questions #8 and #9.