Finishing Stats methods, cleaning up