cleaned up border-rad includes