Code cleanup
 Minor changes
 Import input files