Some cleanup and updated README