Refactored, cleaner