Refactor op methods out of the source