massive coding style fixes.