Cleaned more code around extract_data and the subject list cfg window