Cleanup and style police.