Refactored shit