Renaming things/adding comments