proper renaming and code cleaning