Fix cornerRadius, cleanup a bit