no fluff refactor

RTFC. @arkham: review?