Add some comments and shortened some lines