Separate comments a bit better