Post refactoring and adding comments, but before testing.