Refactoring Refiller

cleaning code, some comments, now testing