Update readme for module changes
Misc code cleanup and documentation