Refactoring

[matfire]

Lots of pieces of code are duplicated with slight (if any) variations; this could be simplified and would also probably reduce bundle size (though not that important, I'll take it if I can).

• check for duplicate code
• extract it in lib folder