syntax and style changes.  Also made line breaks for clarity.  Needs refactoring to avoid multiple class declarations per manifest