Refactor tickets

matter of taste, though