Tweaked refill handler to use max fill instead of hard-coded values
Removed pointless commented code