Refactored more