Made Comments more tidy