code cleanup
sao band code cleanup