Make func and var names more verbose, readable