reformated according to new style