cleanup and reorganize around composable actions