Code Cleanup: Removed some extra code fixed var name bug.