* mainly clean up to double check things
and help ensure anyone looking at this code
can get enough of an idea of things from the README
and code.
* also removing a catalyst specific line from the README
Change-Id: I648e668553970f2934d1608b8af89448990e3d3d