More refractoring on interview class