Refactor tickets

true ...