Fix lint errors introduced into ImagesLayer, util/format and tests