Refactor

Test controller
Use 2 (not 3) spaces for indentation.