Made the grammar prettier -- under 100 lines, now :)