Some slight cleanup to method names