Refactor tickets

see above