Refactor Unicorn in development