minor cleanup
minor safety fix