Cleaned up the code to align names and add paramertized file name to scala app.