last few code clean ups