Cleanup of some fill code
Merge branch 'master' of https://github.com/MMazzocchi/kiwi