BIG style cleanup.