Style update and code cleanup.