Refactor

Test controller
Final newline missing.