Small updates + Format