Simplify wrapping in moment
More specs