updated some comments and removed unused methods