Code tidy up.
Merge branch 'code_tidy' of https://github.com/revive-adserver/revive-adserver into code_tidy