nice refacto of some controllers