Changing code format. Cleanup.