Finished comment handling