Code cleanup
Merge pull request #312 from Connexions/splash-code-cleanup

Code cleanup