Updated with annotations; eliminated non critical terms

Signed-off-by: Bruce E. Wilson <usethedata@gmail.com>