Small changes on output formate.