Made minor tweeks