Comment changes to follow the go standard