General minor cleanup