Removed commented codes and changed a few things