refactor and simplification of the project