Update comment for dev e-mail address tweak
Extract helper functions in dedicated folder and files for more clarity
Correct a small typo