Better not to change variable type and other minor enhancements.