Move displayPolicy out of init, commenting and other tweaks