Small changes in formatting and in factory