Code review changes and prefs