Add comments, delete unnecessary commented code