Minor formatting and renaming of variables in preparation for publishing to main branch