faster
refactoring / cleaning some structures (no unit test)