Cleaned up the action definitions.