Cleanup comments further