Minor refactoring

Hi Lien,

As discussed, here are some minor refactoring that makes everything (more) neater and updated!
I hope this helps 😅

Please let me know if you want me to revert something :)

Signed-off-by: Utkarsh Gupta <utkarsh@debian.org>