Changed member variable naming convention and stricter args enforcement.