revision variant loading optimization, code cleanup