Cleaned up source. No functional changes.