I9: Little refactor