EAGLESIX-2695 Ordered functions to match the c++ code.  Minor grammar changes only.