Code comments, Rename variables, code cleanup