Cleanup and style changes.