(refactor) Language controller cleanup
Merge pull request #94 from browles/master

(refactor) Language controller cleanup