code cleaning (renaming)