Code sample cleanup