Format code, also use let consistently