Refactoring and cleaning; preparing for merge

Signed-off-by: Simone <hello@simonewebdesign.it>