Collection controller's code cleaned