Improve API/class readability