Minor fix in variant reading
Other minor fixes in variant reading
Performance and code style improvements for variant reading