Cleaned up imports, vars.