Moved heading sizes into _vars and cleanup