Reformatting and small fixing of public / private issues