Refactor tickets

fixed