Weee more refactoring