Whitespace cleanup
Initial commit of trapping driver