Change comment type, add squashing and format check