All cleaned commented and working