Reformated some lines, removed some commented lines.