Update Guidelines and comment consistency