Code cleanup. And took renaming refactoring for a spin