cleaning up register class (renaming variables)