Commenting cleanup

As the title suggests