Code cleanup, updated README