Modify a comment + restructure the code.