Whitespace + remove logging