Code cleanup, updated README.