Code cleanup and Renaming