Comment actions refactored