refactor Zodiac