Clean up some of teh codez.