Refactor

Test controller
Keep a blank line before and after `private`.