Making some minor changes