controller tidy (mostly to facilitate my understanding by looking to the code)
merged master