Code Cleanup ninjablocks and Quigg_switch