Improvements re review & 2 space indenting.