commented and cleaned some