Refactoring and Commentary.