Non-integer radii and speed refactoring