Refacor the proj, Clean the code and rename the functions.