-- Minor modernization