Minor Code cleanup