More code clean-up/restructuring.
Improved documentation of simple_test.py