More refactoring on balls