SA style cleanup

resolve problems with sixth block style