Cleaned up some duplication, already had a cancel operation!