Add some comments and remove whitespaces