Cleaned up code.
Cleaned up code, added option for space/no space between name and type
Prepping for more metadata in Jav Ananlysis
minor tweaks