Refactor each cycle