Code clean up and fix for stance/shift bar