fixed break blck scope; some cleaning up