Refactored something