Reformat to match zepto style