Refactor Radius-Functions