Made some minor tweaks