Cleanup whitespaces, no semantic changes
Add refill_handler to rules
Update README