Cleaning commented code and fixing a typo in README