Clean up + Radio style according to spec