refactored fillup service