nini Refactor