Last refactoring for now