Some cleanup and readme