Optimize + readability folders, vars, opts