Code cleaning on main (see issue #1)