bunch of refactoring
cleaned up on the application is outputting data to the console