Clean up system generation

Change: rename variables and format code for system generation.
Change: revise parse methods to use class in System namespace.