Commit before refactoring into method and function distinction.