Minor Code Changes