Refactor

Test controller
Use the new Ruby 1.9 hash syntax.