Refactor border radius