Cleanup and simplification of var declarations
Further D6->D7 cleanup including README and INSTALL guides