Comments refactored