Cleaning up ABO code