Refactor tickets

Okay, fixed!