Further cleanup of operations, with more helper methods