Refactored even more