Delete border and Modify sample code