Reformated some code presentation / deleted some comments