Tidy up borders