Remove some comments and rename for consistancy