Corrected input-labelling mistake
Cleaned and prepared for the new project