renames and a bit of code cleaning