updated for other loggable actions
cleaning up code