Some smal unintergesing changes