Nishi minore refactor