Small cleanup in ActionController