Ticket #1:

Combined the two styles together, removing duplication.