Using better method names
Updated docs