Cleanup pointercalculator class, added override spec