Changed README, cleaned code