Doing some minor changes