Some refractor to the project