Reformated some code