Code cleanup.
Merge branch 'master' of https://github.com/marijngiesen/deploy-ui.git