Minor tweaks done