Cleanup and readme update