Refactored smth