Handle code samples better