Fix variables and tabs