Refactored more again