Renaming, Code cleanup and String extraction