Refactor

Test controller
Use space after control keywords.