Cal & Andy - More refactoring