Made minor improvements