Refactoring previous commits