Refactor

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