Refactor

Test controller
Don't use parentheses around the condition of an `if`.