Improved structure of doActions