Commented and cleaned more