Extract helper functions to dedicated folder and files for more clarity
Correct a small typo
Add media helpers