Further refactorings for balls
Merge branch 'refactoringBranch' into develop