Edited Comments according to golint