deleted some comments and empty lines