Change comment style and shorten vars