All comments need a bit of double check and improvements and in existing modules/resource we can remove old comments