sao band code cleanup