Edit and commented code