Cleaned handler and updated README.md