Refactor FIll