Minor style changes and security updates