add more comments and remove unnecessary settinngs