Change to use immutable `let` constants where possible and remove ;'s