Mostly quotes, remove some unneeded comments, ... Change-Id: Ie3f410ac84e6cfe48e7971af948326abc21f2554 Reviewed-by: hjk <hjk@qt.io>