Added minor tweaks