Initial cleanup, introduced Action interface.