Created better comment structure