Update comments + remove newline