Small coding style tweaks in main Entrust class