More notices and whitespace