Made changes to the code base post refactoring