Dev/refactor mix