Cleanup readme and draw code