Commented and cleaned