Refactoring previous commit;