Cleaning and formating project to new features :-)