Moved actions into extension methods