[sluggable] some cs cleanup