Whitespace and debug notice cleanup