Refactor/chanjo

Just a simple update to the Chanjo post that I've been meaning to get to :ocean: