Update cycling analysis (#31)

* Update and refactor cycling analysis

- Refactor functions for clarity
- Update logic to account for new monitoring
- Backwards compatible with old monitoring

* Remove dependency on `monitored` field