Code cleanup
Merge pull request #2 in BBCTHREE/i18n-routing-bundle from feat-code-cleanup to master

* commit 'aa3ccad74a4b0499faffabe592f59a749bf6b1fa':
  Code cleanup