refactored unfluff