Update README, clean code