Refactoring, void implemented