Reword and rename some code