Updated README, code cleanup