Fixes wrong corner radius on init. Code cleanup.