Some renaming and some code cleaning