Commented and cleaned the project