Just some comment cleanup and updating