Small changes as I went through the code