added some comments and cleaned up