removed pointless comments; changed others