Move to its own before_filter?