refactor. vars -> inline