Major cleanup and updated readme