Cleaned up code, changed output format, added to readme, removed unused code