Skewer: Code cleanup
Skewer: Merged with master