updated README, more code cleanup