clean up, minor optimization of setosccal