Refactoring and commenting.