Got rid of extra handlers
Update README