White noise refactor