Version 1.0.3
Replace magic numbers with enumerated type; cosmetic changes.
Cosmetic: noted some issues/to do items