Adding some comments and extracting a variable.