Some Code CleanUp