Move heavy lifting to manager class, clean up actions