Refactor, test danger