rounded corners refactoring