Improve method names, specs