Clean up logging

Moves logging to occur on the actual actions and not the things calling the action.