Slight cleanup in variable-names