updated README, refactored names