Refactor tickets

no newline