Incremental work
Cleaning up some logic