Made minor tweaks