Some Code cleanup