Did Some Code Cleanup