Refactor controller logic
Remove junk comments from lang file