Cleanup, use let instead of var