fixed output formatting and naming conventions, got rid of junk