Status and Comment refactoring