Minor tweaks to method visibility and naming.