move actions to action classes and cleanup