Whitespace cleanup
Switch from util -> notify