Commented and cleaned some stuff