Reformated code #2