improving helper functions' readibility
Merge branch 'extension-exercise'