format + remove uneeded check