Small refactor, changed cycle to true as default